Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 6 May 2010 12:51:40 +0000 (12:51 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 6 May 2010 12:51:40 +0000 (12:51 +0000)
commit5fcdbba6ce3c493ba6becc6a50d43c2f3e2f69e1
treec97b9711922aa1fc5c0821d154be65944a23426f
parenta2498742541b6c9f5e08147b0adc5a99eb3bf7a7
parent7c192d64a9544f1ca5765e87c1ed59ba5c8b33b3
Merge from mainline.